From cbc86c2b904bf6d3abdafb04e76433d614412885 Mon Sep 17 00:00:00 2001 From: Robert Brady Date: Wed, 26 Jul 2000 00:58:46 +0000 Subject: [PATCH] remove <<<<. oops. --- ChangeLog | 1 - ChangeLog.pre-2-0 | 1 - ChangeLog.pre-2-10 | 1 - ChangeLog.pre-2-2 | 1 - ChangeLog.pre-2-4 | 1 - ChangeLog.pre-2-6 | 1 - ChangeLog.pre-2-8 | 1 - 7 files changed, 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 62e9630f5d..a23318695e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -110,7 +110,6 @@ 2000-07-25 Havoc Pennington ->>>>>>> 1.1355 * gtk/gtkprogressbar.h: Implement new sane, 5-function API for using GtkProgressBar. See Changes-2.0.txt for details. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 62e9630f5d..a23318695e 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -110,7 +110,6 @@ 2000-07-25 Havoc Pennington ->>>>>>> 1.1355 * gtk/gtkprogressbar.h: Implement new sane, 5-function API for using GtkProgressBar. See Changes-2.0.txt for details. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 62e9630f5d..a23318695e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -110,7 +110,6 @@ 2000-07-25 Havoc Pennington ->>>>>>> 1.1355 * gtk/gtkprogressbar.h: Implement new sane, 5-function API for using GtkProgressBar. See Changes-2.0.txt for details. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 62e9630f5d..a23318695e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -110,7 +110,6 @@ 2000-07-25 Havoc Pennington ->>>>>>> 1.1355 * gtk/gtkprogressbar.h: Implement new sane, 5-function API for using GtkProgressBar. See Changes-2.0.txt for details. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 62e9630f5d..a23318695e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -110,7 +110,6 @@ 2000-07-25 Havoc Pennington ->>>>>>> 1.1355 * gtk/gtkprogressbar.h: Implement new sane, 5-function API for using GtkProgressBar. See Changes-2.0.txt for details. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 62e9630f5d..a23318695e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -110,7 +110,6 @@ 2000-07-25 Havoc Pennington ->>>>>>> 1.1355 * gtk/gtkprogressbar.h: Implement new sane, 5-function API for using GtkProgressBar. See Changes-2.0.txt for details. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 62e9630f5d..a23318695e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -110,7 +110,6 @@ 2000-07-25 Havoc Pennington ->>>>>>> 1.1355 * gtk/gtkprogressbar.h: Implement new sane, 5-function API for using GtkProgressBar. See Changes-2.0.txt for details. -- 2.30.2